Fix @GuardedBy annotations with invalid lock expressions.

- fix typos
- qualified 'this' accesses can only be used for enclosing classes: the
declaring class is accessed as 'this', enclosing classes are accessed as
'OuterClass.this'
- replace annotations being used for general documentation with comments
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=75324114