Merge "Remove Android.mk by specifying license" into main