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

* commit 'b78348d5b49ab2899b414d5700f0d7e6e797dfc6':
  Remove stale dexopt flags.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build