am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo

Merge commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b' into froyo-plus-aosp

* commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b':
  Don't set encoder component role while we query decoders