am 1147407b: Merge "Remove unconditional swap from the android atomic operations suite." into honeycomb

* commit '1147407becd8569ad1ddcf620a10076675ef92da':
  Remove unconditional swap from the android atomic operations suite.