Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407 am: 9893288b Change-Id: Ic495ebcea524d4331de9d23f0e68a81365aebecd