am e65f77a2: am 46bbff71: Merge "clean kernel headers" into jb-mr1-dev

* commit 'e65f77a2ce4033b57cfefc3fee61bd07dc06e458':
  clean kernel headers