Merge "Convert to Android.bp" am: 9016ed8106 am: 80320575ce  -s ours
am: 325e69119b  -s ours

Change-Id: Iee44c3c8a705b6a31311a203d9103074885db3b6