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

Change-Id: Ia7b25312efc2e93981aa60673baebdb2213111c0