#856 Build error with Android.
Merge branch 'fix_android_app'
Merge branch 'master' into 1.5-development