Merge "Convert Android.mk file to Android.bp"
am: e6bcf626be

Change-Id: I960027bd43c94d6d9908b83a1a13bffab8973549