Clean up ArtField/ArtMethod relocation for app image. am: 2180d8e8d8
am: e258ae5940

Change-Id: Iad071b872fb97325bfb0273266c9506ab019a84c