[automerger skipped] Merge "Convert to Android.bp" am: 128f68acb2
am: 8e315deff9
am: 948cbbe986
-s ours
Change-Id: I3d252fbba6968af7dcc3d9d6be16a0d2d8b062a7
This commit is contained in:
commit
29e2bcb6c9