Merge "Convert Android.mk file to Android.bp" am: 4830ba0fd1 am: b564e24363
am: 240b4ab04a

Change-Id: Ibe31f8b654ca7120639e21b8363b12baafd2e7a7