Merge "Fix ProtoId ordering check in DexFileVerifier."