Merge "Convert Android.mk file to Android.bp" am: 86598f6ab5
am: b72b9e5332

Change-Id: I6a60b17c0badb50e74f171b6aaebbc1389a289a4