Merge "javadoc cleanup for audioeffect" into jb-mr2-dev