Merge "Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT" into honeycomb