Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407 am: 35bbfae5 Change-Id: I14b2caf450f18ec2d8bc9f351c244bb26b49840d