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

Change-Id: Ic0713c2e60e2dc1e10b12f7349633a484c07f380