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

Change-Id: Ia82bf7232181dd8e66504cd9122091e06b8835a3