am 6c7b6fb3: resolved conflicts for merge of b2028868 to gingerbread-plus-aosp

* commit '6c7b6fb3d2fda5cc5b881e01eb8bb0936ef0eeaf':
  IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings