Merge "Add IMemoryToken and the HidlMemoryToken"
am: bc06f24c16

Change-Id: Id774637676c3132fc8888b817902997de117bd08