Merge "Prevent definitions of expected.h from being included twice" am: 99087decb9 Change-Id: I74124ec1ca8b4b43cdd0cfdb17bac2402c9f3b4e Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core Cr-Mirrored-Commit: 040df27b1d21ffc3536e76945a0cba90219f53e2