Merge "Add an option for disabling dex file verifier."
am: 1ccfa59c18

Change-Id: I536c9fbaf685a0b1ec03433511688d646b937026