Merge "ObjPtr<>-ify annotation processing." am: cbe50e965b
am: 346c3954eb

Change-Id: I533febaef9d0da5e6858f8d6e31d7e7d31da333f