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

Change-Id: I8799566a9b3c7859e8b069c1d43377bdc32aaaff