Merge "Fix mac build." Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core Cr-Mirrored-Commit: 5445c73012e8b8e6b08c7cb9d74b99028c14d4a3