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

* commit 'f11e5473461d9f33d4427187fb945a1edcf2ef34':
  Fix ProtoId ordering check in DexFileVerifier.

Change-Id: Ice809c9f52019b6bc26ed8b374be5de098569a63