am a3140e58: am 68ffdee6: Merge "Update to v3.18.21 kernel headers."

* commit 'a3140e5801d69dc3a818d09eb3097f78204a7d86':
  Update to v3.18.21 kernel headers.