Merge "Avoid recomputing the dex checksum during class loading"