Fix ~HidlMemory am: 280af0a664
am: 9007534437

Change-Id: I0c62edd5c2f411e3cf5cf1bbe4cec4d1082711c9