Plugin4 merge gmpdir


This works with the new mozilla/gmp-api if you want to do it this way.