Convert Android.mk file to Android.bp am: d23e29c24c
am: d665ed6d10

Change-Id: I971c1a4964f14fc26235fbab849fd0b6e599bb86