Copying #2 over; adding missing components under FirefoxOS