Merge "Tweak docs on 'adb logcat'" into ics-mr1