Merge "Remove unused frameworks/base/Android.mk" into main