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

Change-Id: I1b5e4c626d686379c570316181c020c5e16aa378