Merge \"AudioFlinger: fix capture stop sequence\" into nyc-mr1-dev
am: a5bcf56619

Change-Id: I17cde8f3113d5371e24ce1d4adafa2413752b0e3