rolling back serialization changes to avoid a ctor ambiguity with AS and Play
removing error.cs from android as well
Merge remote-tracking branch 'origin/master' into ps-as-fix2