h: cleanup my pet fuzzy octo tribble

Change-Id: I29b1c5087744056a714677f011125bc7df1069e2
Merge "h: cleanup my pet fuzzy octo tribble" into cm-11.0