[automerger skipped] Merge "Convert Android.mk to Android.bp" am: b946ef9061 am: 5c0b96faf3
am: 1bfc1197c1 -s ours
am skip reason: change_id I3e828272090ecf56a82dbe636f379fb04ade02f2 with SHA1 bec3a3843c is in history

Change-Id: Ie971de29eecfebd7429a4dbe35727abffcd94636