Merge "Don't destroy ART profiles after package move." am: 6a1aed6f64

Change-Id: Ic07942e3c050a0799549c1d40435832cd9013fe5