am 12e3639a: am c383c6d1: Merge "Add "import" support to system property files."

* commit '12e3639a6e1cdd77af0964e10081311430fd065c':
  Add "import" support to system property files.