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

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