Merge change Ib64cab41 into eclair-mr2

* changes:
  Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.