Merge changes I2e00bb66,I00890229
am: 6c597e6bdd

* commit '6c597e6bdd6f3ba9d0ab0fbad43cd7746e34ed86':
  Do not diff .odex files
  Diff libpac.so now that it is deterministic