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

Change-Id: I0859ecc5c630034f283a20c6d87d4728e096be94