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

Change-Id: Icbb351da2abaea75a4cda58d0978bb3f0dde438e