am 18b671d7: Merge "system/extra: include more of what you use."

* commit '18b671d7d3375be639118aa74dd6a88955bf8779':
  system/extra: include more of what you use.