[automerger skipped] Convert Android.mk file to Android.bp am: f041701d2d am: f48d6708df am: aa0f191748 -s ours am skip reason: Change-Id Ice26c9676a5a2c16e43ca1a5f3373ca780e005eb with SHA-1 469bd61ba3 is in history Change-Id: Iaf47444fc15a8309ce0ecf7c77c31430333235f6