am 824c4ac7: Merge "Fix build when OUT_DIR is not set." into studio-1.4-dev...
am 824c4ac7: Merge "Fix build when OUT_DIR is not set." into studio-1.4-dev automerge: ea12935d automerge: eccf2482
* commit '824c4ac7':
Fix build when OUT_DIR is not set.