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

Change-Id: I1801a3a6ca1b297189a5a7b4f3f2315684ba3580