changes for cfx

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml
gps: ISOC++11 Compatibility
overlays: remove unused arrays
Revert "s4-common: remove deprecated recovery version define"

This reverts commit 2149f838f38230f1d2982ee243d8e636c679774c.

We still need this in CFXE
Revert "s4-common: remove deprecated BLUETOOTH_HCI_USE_MCT flag"

This reverts commit 3a0d2e6f7bbf03b6fc0dff8ef7a3bc53e45393b7.

We still need this in CFXE