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

Change-Id: Id5f9cb8dc5563db0cd4c288332f350c5ca3ec949