[automerger skipped] Merge "Convert Android.mk file to Android.bp" am: e6bcf626be am: 7f0a256a78
am: e280e2e614 -s ours
am skip reason: change_id I92f7584aeaf502336f67e04fbc22634784c9305d with SHA1 b61bab6a58 is in history

Change-Id: If1e555e8549034a31fa346b7b81aac30231e9e74