Improvements in Android building process

@koying thoughts?