The change to 6796470 causes the need for new versions of plugin2_mozilla_headers which are incompatible with with other updates.
In order for multiple versions of the headers to be available on the build machines at the same time, we need to put them in plugin2_6u14_mozilla_headers directory, and modify makefile to take it from there.