am 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"

* commit '301843ae3e5a5d121ecc01b58ea3f15ae07c860f':
  Fix for "dexopt: No such file or directory" error