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

* commit '68ffdee696b57b63fce2753508662a920ad71b11':
  Update to v3.18.21 kernel headers.