[automerger skipped] Convert mk files to bp am: 2ec7b09661 -s ours am: 311b22b14d -s ours
am skip reason: Change-Id I9ca2534edc6f4f23718a6818031c4495726ad408 with SHA-1 2ed5949c4f is in history

Change-Id: I1cae382bf7c727798ac50cf9598a954c9cada055