Switch opt-in variable to match cm's dalvik, etc.

Change-Id: Ic407aa915fc65c4920e44fce852de9f2cb2d26f3