Merge "DO NOT MERGE - improve audio effect framwework thread safety am: b378b73dd7 am: 993c09b27b am: 98810b1a06" into nyc-mr2-dev-plus-aosp
am: 5afa6ae2cb  -s ours

Change-Id: I7c9aa8f8fa215e94726392744e34d26ac3cf34ab