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

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