Merge "Use new surface flinger API." into jb-mr1-dev