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

Change-Id: If8c21a956f4ebac6ca6c2737c2d3f7b0ee81933d