[automerger skipped] Merge "Convert Android.mk file to Android.bp" am: 9beab9980b am: fdfbf6cda8
am: 7404cdce48 -s ours
am skip reason: change_id I16795323c51914fffcb4be86445da00adfa62fbf with SHA1 3fe49a50d0 is in history

Change-Id: Ieddd3e670530eda95e901182a3e4980c476ad0ce