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

Change-Id: I50ae012ead7d1d91769caf34d5438a4f6a92f094