Revert "allow timing in release-with-assert builds"

This reverts commit 97708e59ce.

Reason for revert: pain in the butt

Original change's description:
> allow timing in release-with-assert builds
> 
> Change-Id: Ia85811bc113f951f3d7791371a5f97b49d156f70
> Reviewed-on: https://skia-review.googlesource.com/117368
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Mike Klein <mtklein@chromium.org>

TBR=mtklein@chromium.org,brianosman@google.com

Change-Id: I4282f5e887c7ec3198adde11a7300552644d22de
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/117441
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

bench/nanobench.cpp

@@ -86,7 +86,7 @@ static const int kAutoTuneLoops = 0;
 #endif
 
 static const int kDefaultLoops =
-#if (defined(SK_DEBUG) && !defined(__OPTIMIZE__)) || __has_feature(address_sanitizer)
+#if defined(SK_DEBUG) || __has_feature(address_sanitizer)
     1;
 #else
     kAutoTuneLoops;