Merge "Convert Android.mk file to Android.bp" am: 23ab3ba225 am: 0a5ff40f0a am: 9338537419

Change-Id: Iaf8620493704f0efb20ef7ad602d2e599de429b6