Merge "Convert to Android.bp"
am: 1752ac1e55

Change-Id: I06d49e11d96477898a06b61d9c5819cab1b69684