[automerger skipped] Revert "Convert Android.mk to Android.bp"
am: cf2dcbaeeb -s ours
am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1 9a7e79112d is in history

Change-Id: Ib86de327bf5d87717fac4c0d10a0ae0da7899f70