Merge "Move frameworks/base/Android.mk to build/core" into main