Merge "Use ObjPtr for reflection.cc/h/inl" am: 4d46970b8a am: db7e1c3ba7
am: 1764b1dae7

Change-Id: I196dd74a0f029f6f50442affd11e9beae55b659e