Merge "Revert "Add 'Android.mk' file, fix compile on Android.""