Allow specifying a custom aol.properties file from either a project property or a system define
Merge branch 'master' into specify-aolProperties

* master:
  Use nar.os and nar.arch instead.
  Add a way to specify the OS rather than only relying upon os.name.  This is helpful, for example, for building android and iOS.