test some flag changes

Some of the flags are nonexistent, some are duplicates, etc.

Change-Id: Id3b8efc7b11d1cf8402a96c713bfa72b2a409024
TARGET_CPU_VARIANT := scorpion seems to be broken, use cortex-a8

Change-Id: If4d9a227dfaf4d8b0d23e578efc14a012e092d5b
Merge branch 'cm-11.0' of https://github.com/Mustaavalkosta/android_device_htc_msm7x30-common into cd-4.4