am db47ea76: (-s ours) am 6bab84bb: Merge "Update to v3.18.18 kernel headers."

* commit 'db47ea76ab83f2ef5aca42de240035885dc7ad1a':