Merge "Convert Android.mk file to Android.bp"
am: 93068a3c58

Change-Id: I3daed02bce47025f8c8c36349f445cdae8d12122