Merge "Convert Android.mk file to Android.bp" am: 504a33a64e am: c35c355dbb
am: c78d2ff15f

Change-Id: I88fe73e11421204c4f0b2e20b91088cf91bdaa13