Android.mk cleanup.