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

Change-Id: I6bd4bd4812f09098fc166df5e2dbd3a309dd5dca