Bug 988437 - Part 1: Allow unpickling across Android Account types; bump pickle version.
Bug 988437 - Part 1: Allow unpickling across Android Account types; bump pickle version. r=rnewman

This is landing in two parts: this part on android-sync, and a companion
part changing the Android Account types on m-c.