Merge changes Ia93c2952,I09fb90a9

* changes:
  GetCode -> GetPortableCode
  SetOatCodeOffset -> SetPortableOatCodeOffset