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

Change-Id: I257361a26b12e96eff3428dac5aadea95aff3dd7