Merge "Change audio flinger to user HAL master mute if available: DO NOT MERGE" into ics-aah