Merge "Remove ANDROID_LOG_RDONLY"