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

Change-Id: If7406f2b371f921ba9d42e561349214c0227d6b5