Merge "Set incremental apk directories"