am b9599804: Merge "Move the dist-as-droid handling from make to ninja"

* commit 'b9599804877f00fd1efddb18f779216efae14d4f':
  Move the dist-as-droid handling from make to ninja