Merge mozilla-b2g changes into mozsquib repo

...