am cd7bcd86: Merge "Move ninja files to "

* commit 'cd7bcd86e5b7a8ba5cd6dde7dda04cadcf656e56':
  Move ninja files to $(OUT_DIR)