Merge "Allow mainline kernel on non-release builds."