Merge "Add IMemoryToken and the HidlMemoryToken" am: bc06f24c16
am: 887d85c40a

Change-Id: Ie1e2b387c2ee971134c9bedef34494f25048ed75