Merge pull request #1515 from Igalia/more-location-command-line-options

Enhancement: add extra command line options that modifies aml