Merge "Convert Android.mk file to Android.bp"
am: a81d64e940

Change-Id: I8202195e94c616d8b09e76aa01f4d74f098afd3e