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

Merge "Revert^3 "Rename build/make/target/board/Android.mk to android-info.mk and include it in main.mk directly"" into main am: b939affd

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



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