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

Change-Id: I830af2864d2aa58c65a93d4b083974cf30fb8153