Merge "Fix ProtoId ordering check in DexFileVerifier."
am: 60be30a353

* commit '60be30a353aa8515c72aa5240508128bb3ad9829':
  Fix ProtoId ordering check in DexFileVerifier.

Change-Id: Idd59cf687260f2d5d79e3d958ab5036604872679