Merge \\"audioflinger: fix logcat\\" into nyc-mr1-dev am: bb3bee86d5
am: bde5acd3a3

Change-Id: Ie443e96b8231b3fff5773253e7886fe7f5c42150