Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407da am: 9893288b79 am: bcfd0170f1 am: 44c3a3aada
Change-Id: Ib5a5d4194b43b2edeb22322b2119fcd2c038027f
This commit is contained in: