If DEBUG_BUILD isn't unset the subsequent flavor perf/user carry debug artefacts

Change-Id: Ia4ebe9a2f64f4ea76311b3ef91f42c2941d3a934