am ce0d646c: resolved conflicts for merge of 6cda7b62 to gingerbread-plus-aosp

* commit 'ce0d646cc0beb6b44d5429d01e51d00005264f44':
  Bionic: x86: Fix libm macro definitions