Merge "Fix typo in clean vars for dexanalyze_test"