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