Don't use BUILTIN_FIND_HEADERS on older branches.
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3