Revert "Merge branch 'master' of https://github.com/mozilla-b2g/gaia"

This reverts commit 11c85ad98bf9ba1f8d37f7e07a778b3c5b712198, reversing
changes made to 601118bc1f479d8f94ef4beb78c36b5a0bcdcf85.
Revert "Merge branch 'master' of https://github.com/mozilla-b2g/gaia"

This reverts commit 601118bc1f479d8f94ef4beb78c36b5a0bcdcf85, reversing
changes made to cb090fc1bc5d60c0e810dc33c3e0ef46ee678a23.