Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState"