Merge changes I552122d0,I9171a5da

* changes:
  dexlayout: ProcessOffset in WriteHiddenapiClassData
  Print hiddenapi info in dexdump