Merge "Convert Android.mk file to Android.bp" am: 4e06707a71
am: 224ed80629

Change-Id: I074f90b148b8c84b5b38fc9a39b28b72f8f44a39