Merge "Move ninja files to $(OUT_DIR)"