am 69159ba0: Merge "Fix missing #includes in system/core."

* commit '69159ba0b70178a24e6f592dfb9d903629c23a09':
  Fix missing #includes in system/core.