am 4982ef9d: am 010f652e: Merge "Add system/core to the PYTHONPATH."

* commit '4982ef9d76d4ca7189e56377a4032d8fe68fd994':
  Add system/core to the PYTHONPATH.