am 6e207824: resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp

* commit '6e207824af267eea8777949ccf6d0584accd55a0':
  x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3