Merge "Fix build when #define LOG_NDEBUG 0"