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

Change-Id: I83a143d066d9b2d9eabcb86cdaff34a6da96d37c