am 2d459b82: am 660504ac: Merge "Fixes and improvements for SerializationTest" into lollipop-cts-dev * commit '2d459b82': Fixes and improvements for SerializationTest