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

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