Initial Android.mk bringup
Sync the rest with the upstream
Fix compilation