Merge "Fix build when OUT_DIR is not set." into studio-1.4-dev