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

* commit '9c359a3dd28d82a2943e9a624b43bd37229953c3':
  Fix missing #includes in system/core.