Revert "Try re-enabling QCOM_BSP flags again"

This reverts commit 97547b0a2325301cee36d191d0a8b3b3345e87b6.
Revert "scorpion cpu variant is broken again so use cortex-a8"

This reverts commit a551dc2d6e0d45a669398ea97ef0dcc3e08ce11c.
Revert "msm8660-common: update camera wrapper"

This reverts commit 870c3a27a4bc1ea33ad9071f9e1b870658bc7085.

Fixed in Camera2 code
Merge remote-tracking branch 'hydra/cm-11.0' into cm-11.0-ion