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

Change-Id: I481570350c6ce857abe4adc7f3dc03ae0d48d0e6