Convert Android.mk->Android.bp am: 475aad7be8 am: bbf4f35ea3
am: 9979077883

Change-Id: I3e61fc6d3894bcbf7e6d071924a2cff4ec387b52