Merge "Convert Android.mk file to Android.bp" am: f852f1e355 am: 35d7bfafa2
am: fe4c9d4785

Change-Id: Iad698f93e489c8685840cae5267be6be2bd26f16