Revert "Remove PN dependency from GCC"

This reverts commit b76928609409505b689ee18baabbfed8c67e544a.
(Don't) Remove PN dependency from GCC

Cherry pick modfied to NOT remove PN dependency, but keep all the other changes

(cherry picked from commit b76928609409505b689ee18baabbfed8c67e544a)