Merge "Fix lshal not to squash HAL entries incorrectly." into oc-dev am: 8e20f172ec
am: 8f7f17a18d

Change-Id: I69eccc54ab4778439d295016abc969eaac6288de