Merge commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7' * commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7': fix problem in AudioEffect JNI setup.
Merge commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7' * commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7': fix problem in AudioEffect JNI setup.