Merge "Don't include the data dir in zygote library paths." am: 13033a2612

Change-Id: If910e9efbb5cb4cfbee80ed6b86358a549d21975