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

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

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



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