Merge "Revert "Rename build/make/target/board/Android.mk to android-info.mk...

Merge "Revert "Rename build/make/target/board/Android.mk to android-info.mk and include it in main.mk directly"" into main am: 60976d9c am: 39ad2bfa

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



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