Merge "Convert Android.mk file to Android.bp" am: 4830ba0fd1 Change-Id: Ia2f59033a20d001bb8237f6ccd0fb3ac57f36e1e Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core Cr-Mirrored-Commit: b564e24363097556fbfc150a9746a01a50aa6654