Merge "Convert to Android.bp"
am: 90e0a80af3

Change-Id: Iad8ff5ed73ab4d7739e03962aa3ad6d6aa3e0361