ba54eca1 replaces the existing -Wshadow
fixes with a GCC pragma, however we also want to be able to build with clang.

Change-Id: I522f3c549adf65b98522561ab7167258dfda48b5