Merge "liblog: introduce ANDROID_LOG_* flags"