Merge "Convert Android.mk file to Android.bp" am: c4422cb0bb
am: 5a8d09fce2

Change-Id: I47b6447ee39ff20c4e2c455363fa088165351041