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

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



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