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

Change-Id: Ic9b7203ae12e2adba3cadc699d408d9002d791c5