Merge "Add field/method skipping helper functions to DexFile"