Merge "Convert Android.mk file to Android.bp" am: 747cd94568 am: 501a44bcd3 am: 9d88fad545 Change-Id: I9116a1ff39ae57897a017b56c59e704804e9e242