defconfig: Updates
Revert "defconfig: Updates"

This reverts commit 4685c911268a8e2c34a1ccfaf4ca61c05f2e109e.
defconfig: Updates
Merge branch 'JBX' into JBX_STABLE
Makefiles: Revert from additional flags
defconfig: added defconfig with only jbx specific config points
defconfig: Change config to new specific configuration
Defconfig: changes for new rom builds
chmod 0755 merge_config.sh
defconfig.....grrrr