[automerger skipped] Merge "Revert "Convert Android.mk to Android.bp"" into pi-dev-plus-aosp
am: 6a9a4a37 -s ours
am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1 9a7e7911 is in history
Change-Id: I39ac5cf2246711f23582dac5a20974acb9909254