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