Style cleanup for ObjPtr<>-ify changes.
am: 0984e483c1

Change-Id: I97074fa27136f6de0e84c4f96cb133b2c8e197f0