am dd68e68f: Merge "Override properties that point to out/ directory."

* commit 'dd68e68fdd413fe93b78c648e2564c3c3c5e5cc3':
  Override properties that point to out/ directory.