Merge "audioflinger: add watchdog on main mutex" into nyc-mr1-dev am: 6da0f8d15b
am: afcd6783e4

Change-Id: I971d75768d8bbf087d3e0f9ac88131c75cb5e0f8