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

Change-Id: I2e64c731627f971ee28f8e2c95d98a5e5717d841