am 3d59e00f: Merge "Revert "system/extra: include more of what you use.""

* commit '3d59e00f74fa6b866aba09628416555ce06f2bfe':
  Revert "system/extra: include more of what you use."