hal: Fix a merge derp :(

Change-Id: I392d6e4b14410f3bc9083a1a6e70c366940a9374
Merge remote-tracking branch 'cm/cm-11.0' into HEAD