Merge "Update dexopt code with the new JIT zygote image." am: 7cada579e2 am: c1b7b713ab am: d761d39901

Change-Id: I492b5780d0a441e71c1bd70e031e5b510772146f