am 4606ae77: am b78348d5: am 5968de73: Merge "Remove stale dexopt flags."

* commit '4606ae776b628a3021dc3a82fb0699f68e30921c':
  Remove stale dexopt flags.