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

Change-Id: I240bfe414d9c5f2168df676ab2b6c1bcc4a88279