am ef0c3e26: am c8c82009: resolved conflicts for merge of 7573e594 to stage-aosp-master

* commit 'ef0c3e269f15200a3a1111ce9f80516b2d38590a':
  Properly rotate full [-pi, +pi] orientation range if available