Merge changes I2e00bb66,I00890229

* changes:
  Do not diff .odex files
  Diff libpac.so now that it is deterministic