Merge "Convert Android.mk file to Android.bp" am: 348e5d7e64
am: b498aea48b

Change-Id: I0cdd50239c31a8086000939e095194a262ffc4e5