Merge "Refine HidlMemory" am: 30b7dab79b
am: 4b9bc942ef

Change-Id: I82d96558c155fb5be42bf7667c4b0e447e6c1f4e