Merge "Adding per-method clang thread safety annotations" am: 55feb241b1
am: c0bc2616c4

Change-Id: Ic79043ca9243c7a3439733b00063906dcc7f2e4a