am 52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt.

* commit '52af2ca919c068f1c9389fa4c979d2fe3105af40':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.