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