Merge "Add heuristic data race detection to sp<>" am: 04abdc6153
am: 12d6afe6f1

Change-Id: Ic0feb1a422cae36fc71921d77203608300e36b4d