am 5968de73: Merge "Remove stale dexopt flags."

* commit '5968de73fb78e2ca8f32ab0588cac92f74a0435e':
  Remove stale dexopt flags.