Merge "Fix sdk-addon for absolute OUT_DIR"