Merge "Refine HidlMemory"
am: 30b7dab79b

Change-Id: I15b981cd30fd324a4d83c4baa2a7076c37dc9922