Merge "Fix swap of sessionId and output in audio effect API." into gingerbread