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

Change-Id: I9cb4db72d541d3ae710001e56046ffebb1c44827