Merge "Add plumbing for new surface flinger display API." into jb-mr1-dev