Shut up warnings added by -Wundef

Change-Id: I9c7ef4a75c37aa0e10df75e165e3066614c955ef
10 files changed