Merge "Convert Android.mk file to Android.bp" am: 069ba8677d
am: 4b155f3f12

Change-Id: I056fd7a439cea1d80294686b5aa862b106ccadeb