Merge "Honor ANDROID_LOG_TAGS when logging."
am: 43faa46d23

Change-Id: I22e95e533e4e4d77e507b8305f9da164007bd15e