Cleanups in Android.mk