Merge "dexanalyze: distinguish fields from other classes."