Merge "Convert Android.mk file to Android.bp" am: a81d64e940 am: efa1d26538
am: 8e0d9d8473

Change-Id: Ic6d75ff8e072f9f3eb6ca472bea0122ac220075a