Improvements in Android building process

Most probably ok, yes.