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