am cb094a78: Merge "New compile-time flags to make debugging easier for us...
am cb094a78: Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815" into jb-mr1-dev
* commit 'cb094a78':
New compile-time flags to make debugging easier for us poor souls Bug #7195815