Merge "Fix compare_exchange_weak tests to allow spurious failure" am: e06c69d073
am: ac7950c81b

Change-Id: I3724d0a27b542da72851fe4b50945b77123f2fa5