am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev

* commit 'ba7dc2db6e93a2407c8c328f2838591b7b760658':
  SurfaceFlinger: add support for secure displays