Merge "Convert Android.mk to Android.bp" am: b13276924c am: 088fb8d35a Change-Id: I4336ddd0a6d3251b11cee8a474f30214dde75e49