Merge "Revert "Revert^7 "Rename build/make/target/board/Android.mk to a...""...

Merge "Revert "Revert^7 "Rename build/make/target/board/Android.mk to a..."" into main am: 928fa229

Original change: https://android-review.googlesource.com/c/platform/build/+/3417220



Change-Id: I737d97b5fbf730f2b48c46d82948d5dd403c0156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>