Merge change 10635

* changes:
  Add a bit-map encoding of Object-reference field offsets to ClassObject.