Merge "Don't include the data dir in zygote library paths." into rvc-dev