Merge "Update JIT Zygote image option for installd and otapreopt."