Merge \\\"Convert more Android.mk files to Android.bp\\\" am: 4c06cd8634 am: e42cfef51b
am: 866a4d0541

Change-Id: I83a4373eedd6f5f1c8c23cbb7a696aa2a2e4357a