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

Change-Id: I8f722aa4490892ee27bcb951c09723c04f7dce1a