Android CTS 6.0 release 6
Merge "Fixes and improvements for SerializationTest" into kitkat-cts-dev am: 6f2da389d1 am: 2873b21e00
am: 8e42007703

* commit '8e420077032654de5c075e3934be1b8d88599c3b':
  Fixes and improvements for SerializationTest