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