Merge "Change size_t member of hidl_memory type to uint64_t" am: 1658ce92e3
am: 8a405ea301

Change-Id: I4862fe3cbd849c2ee94208b8504c64a20b53afad