Merge "runtime: Make kIsDebugBuild friendly to clion" am: a97a14fa20
am: 6fcf1fbf51

Change-Id: I7bbd9571aa9f57f8bf3f64095ea117677f0f6a1b