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

Change-Id: I1867070622cf8799859db748e6ca8bb6aadf7ed3