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

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