Preprocessor conditions referring to undefined macros failed standalone
build which uses the -Werror=undef setting.

This same error has been in multiple patches, and reverting them would
cause test breakage, so fixing the issue is simpler than reverting.

Change-Id: I4a079ef5d823eed76ebdefa8be413f63d29a5f6a
Reviewed-on: https://chromium-review.googlesource.com/304020Reviewed-by: Olli Etuaho <oetuaho@nvidia.com>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>