Merge "Pass app's data dir to ART"
am: 16749ac83e

Change-Id: I170cbff78d12ccc418cb440820a584f141f28433