Merge "Fix malformed Android change marker in ObjectStreamField."