Android NDK r20 Beta 1 (build 5344622)
Merge "Remove Android.mk."