add extra tag and switch between goo props based on TARGET_WITH_DEXPREOPT

Change-Id: Ic5239edda5ea7b22dc383af7e402fa8698b3d0a0