am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev

* commit 'b43269acddb7061c43fa6ace6a896c51a9bf4dce':
  Secure windows, secure surface views and secure displays.