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

Change-Id: I9a7c617f13dadc91b735837d1778e3d526be8520