[automerger skipped] Merge "Use new image location for JIT Zygote." am: ada87ea525 am: ad1b60d2bf am: 732b2c8805 -s ours
am skip reason: Change-Id I7add3006b0d72b005daabb6609d954b466985304 with SHA-1 9ac03a0504 is in history

Change-Id: Ide72cabafe28ce30a7302a43312f9a2ff31f70a3