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

Change-Id: I4c89fdcea0c63fb0830592478e518cbba95ff6d0