am 64f3b2fd: Merge "Remove experimental HWC virtual display support" into jb-mr2-dev

* commit '64f3b2fd1ea9d30df6fd04ecdb086e540465bc18':
  Remove experimental HWC virtual display support