Merge "Diff .art/.oat/.odex files now that they are deterministic"