Merge "Use new image location for JIT Zygote." am: ada87ea525

Change-Id: I07fc3c210b827f8ea21126bd1fdb27ff7bbdeac4