Proper fix of debug build issue
Proper fix of debug build issue

[Bug/Feature]   Previous fix for build in debug mode issue was
                unnecessarily too complicated.
[Cause]         N/A
[Solution]      N/A
[Verification]  Build with --define "build_type DEBUG" gbs option

Change-Id: I83da147dc67ff62d851f14d7acc06b067fd0b15e

Samsung/vasum,Samsung/vasum,Samsung/vasum,Samsung/vasum