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

Change-Id: Iec85a2630e364e66e45e42f2cbb6a26008c0ab4a