Merge "Make "adb logcat" pass $ANDROID_LOG_TAGS through again." am: b838ff65d9
am: a4f497e0a2

Change-Id: Iba736a025518b0741971820ec5476996ba54f695