Merge "Don't include the data dir in zygote library paths." into rvc-dev am: aa9b7407 am: 35bbfae5 am: a4926600 Change-Id: If7d15063d238230b0937fdb60f595a42b5ea3671