Merge "Convert to Android.bp" am: 1cfc9bb140
am: f8a26b926d

Change-Id: I33df472d5ceb70aba32e25b283e8e4ade33aa637