Merge "dexanalyze: Improve field analysis."