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

Change-Id: I0a7c97da240f153cc48af6d537b215501f72c2e8