Merge change 22991 into eclair

* changes:
  Apparently setting the preferred role of the OMX component is now required on this platform.