Merge "Convert to Android.bp"
am: 4e3bf63705

Change-Id: I0ba1e244ebf41b8781c53c6dcccb71280322a228