Merge "Fixed audioserver crash in monkey test" am: db44c5d13b
am: 5e64d79404

Change-Id: I137e4b91a0b8e56697963e629173cf5a28a7d8d0