Merge "Don't set encoder component role while we query decoders" into froyo