Improved build on Android