Merge "Convert Android.mk file to Android.bp" am: 5656a003e6 am: abff539b0d
am: bd3f0f1f0b

Change-Id: I1b7f0d115140d9a449a82fa302ffa0c4f09ed52c