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

Change-Id: I8f1fab1823d8c6d7de1214d0d9f54a7af7d1b895
Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core
Cr-Mirrored-Commit: 4108479a5099be44a74fb20865b7893c56ac3d7d
2 files changed