Merge changes I456d9ef6,I593c0231

* changes:
  hwc: do not require hdmi
  hwc: do not require manta to build