Merge \\\"logcat: clear when specifying file output\\\" am: c91fbfee48 am: 51708a4725
am: 6a7bfbcea9

Change-Id: I174fd548a1f447ccf896b4c97fad0dabea61b4a3