Merge "Fixed audioserver crash in monkey test"