Merge changes I06bd271c,I5071ff96,I4212f35f into jb-mr1-dev

* changes:
  disable pre-rotation correctly
  TEMP: remove adreno_config.txt
  Revert "mako: disable pre-rotation"