Merge "logcat: error on multiple PID argument" am: 41a5c022b4
am: 50b137c86e

Change-Id: I4ddb5924ce5f77eeda287bf67e4347f2b6ef6bc6