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