Merge "Convert Android.mk file to Android.bp" am: da44f9cf37 am: 56c2c6c8ca am: c135cdbe7a Change-Id: Id75aacff8001d0279233f949839a1502e6e1580e