Merge \"logcat: clear when specifying file output\"
am: c91fbfee48

Change-Id: I21a55367980a0a6f6a97cf98f0350897a2938929