Merge "Revert "Fix dexlist build""