Merge "Fix lshal not to squash HAL entries incorrectly." am: 665173c59d
am: 167edf54a0

Change-Id: I6a0f3b69ff758598982971825747a19588e6063a