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