Merge "Convert Android.mk file to Android.bp" am: 9d9163f90c am: 5bdef0eb24
am: 10d08a85a3

Change-Id: I35426b52a29c30c9a1b425a52625ec88f480b953