Merge "AudioEffect types in SDK" into jb-mr2-dev