Merge "Make checker-constant-folding less dexer dependent."
am: fa5b9c8469

Change-Id: If8e485ca985fefd1816acca99b29e027f6cac560