[automerger skipped] Merge "Don't include the data dir in zygote library...

[automerger skipped] Merge "Don't include the data dir in zygote library paths." am: 13033a26 am: f7f22f25 -s ours am: 34beaec8 -s ours am: 05f7799d -s ours

am skip reason: Change-Id I9aceecaf6067e748cc2251782b0f41661cbb35d8 with SHA-1 465c5fb2 is in history

Change-Id: I9443a6494dd281c6898f61e6ba20f4a3d702b40f