[automerger skipped] Merge "Convert Android.mk file to Android.bp" am: 6cb9de0e1c am: a2e5c1fb8a
am: e8e3de8af4 -s ours
am skip reason: change_id I970a37e967d41abd38951cc8a5598eb1e0b27c3d with SHA1 5f1ea5263f is in history

Change-Id: Ieb69678bf51bb2909d29ced1200efb011d02e800