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