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

Change-Id: I9774f93056bcbffb4032115eedcbb719874da450