Bug 956844 - Part 1: update Android FxSyncAdapter to use new onepw protocol login flow. r=rnewman
Bug 951304 - Part 1: add FxAccountAuthenticator.getFirefoxAccounts. r=rnewman
Bug 956844 - Part 2: rework FxA state machine. r=rnewman
Bug 951304 - Part 2: first cut at native UI for Firefox Accounts on Android. r=rnewman
Bug 951304 - Part 3: first version of FxAccountUpdateCredentialsActivity. r=rnewman
Bug 951304 - Part 4: include a stub string for Fennec. r=trivial
Bug 951304 - Follow-up: add missing file from Part 3. r=bustage
Bug 960324 - Use "BrowserID" in Android tokenserver authz header, not "Browser-ID". r=rnewman
Bug 960322 - Use "BrowserID" in desktop tokenserver authz header, not "Browser-ID". r=rnewman
Merge m-c to s-c.