use encode/decode instead of serialize/deserialize

Change-Id: I273bb86d32cb763e1eb8bbbe4efa7a8dab541c51
6 files changed