Merge "[automerger skipped] Merge "Convert Android.mk to Android.bp" into pi-dev-plus-aosp am: 306ab7ee28 -s ours am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1 edfa8e90a1 is in history"