Merge "logcat: filter based on UID"