Improvements in Android building process