Merge "Build: Factor out ANDROID_LOG_TAGS"