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

* commit '3b093369d85f2d248799073152ece79987d4b30b':
  Remove unconditional swap from the android atomic operations suite.