am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1

* commit 'ff3b5a828ea1f7409af4475898689804bed10ede':
  Make the dock orientation override the HDMI orientation.