Merge "Move some DexFile checks to debug build only." into dalvik-dev