Merge "Fixes broken build on crosshatch-userdebug when enable LOG_NDEBUG"