Fix logic that looks for shift builtins.
Merge pull request #651 from jbrodman/shiftfix

Fix logic that looks for shift builtins.