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

Change-Id: I8fc4e19c50c8baeef07680455e020231e25efa6e