Merge "Honor --force-determinism for vdex." into oc-dev