Merge commit '52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp * commit '52f58e96a723a56e6619c237c814a07503745de9': fix problem in AudioEffect JNI setup.
Merge commit '52f58e96a723a56e6619c237c814a07503745de9' into gingerbread-plus-aosp * commit '52f58e96a723a56e6619c237c814a07503745de9': fix problem in AudioEffect JNI setup.