Merge "run_dex2oat: remove FDE-specific code" into main