am 850ca4fd: am cd7bcd86: Merge "Move ninja files to "

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