Merge "SurfaceFlinger: define LOG_NDEBUG for debug." into main