Merge "Fix a race condition in the crash reporter" into oreo-mr1-cts-dev