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

* commit '3aabdeaceff8405406d90c329a6691552559556d':
  Fix for not reporting correct "sw" in compat mode.