Merge "Convert Android.mk file to Android.bp"
am: 3b5f4437b9

Change-Id: Ia2f59033a20d001bb8237f6ccd0fb3ac57f36e1e