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