am 478bfb9a: Merge "Stop the kernel complaining about rild."
Elliott Hughes authored
* commit '478bfb9a':
  Stop the kernel complaining about rild.
56865265