am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2

* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
  Fix for not reporting correct "sw" in compat mode.