Merge "Reimplement ART_NDEBUG_OPT_FLAG"