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

Change-Id: I07ed85ddb9d9da89f09c2d403ef1edec6912307f