fixing build on android.
Merge remote-tracking branch 'origin/develop' into errorui