Merge "Fix ProtoId ordering check in DexFileVerifier." into nyc-dev