ba54eca1817e84a1f1d1beec312ca87b8b059649 replaces the existing -Wshadow fixes with a GCC pragma, however we also want to be able to build with clang. Change-Id: I522f3c549adf65b98522561ab7167258dfda48b5
... based on upstream feedback. Change-Id: I846287d62d3b53f4a3d3013c9f82fd77d22a9523