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

Change-Id: I439128150a941b09b4719c0981f8f0571b92748b