Merge "Convert Android.mk file to Android.bp" am: c6ef1d2dc0 am: fb9b1617d6 am: 6cba44e3ca Change-Id: I4c76dc88bdcc24f4ff9129056b8c18a891d7f436