[automerger skipped] Convert Android.mk file to Android.bp am: 75b90f4631 am: 8eb596b34f
am: 4695abb0d2 -s ours
am skip reason: change_id Iabca84a02451ac57774e4e7263f9de5ff0e38c4e with SHA1 345d2b8e06 is in history

Change-Id: Ib918bb03ec8601c8ddffc384a5dcd93c6e4eb822