Merge "Add field/method skipping helper functions to DexFile" am: 77c7d10932 am: 75071966c4
am: d1cfaa563a

Change-Id: I9e47dcbc97af8208f6de3403cf8afe532a5bc6f3