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

Change-Id: I79336080bf8e809514b1c6282103ae2ecaf1facb