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

* commit '29e44b7a8300644516b021e9e324ffe426098b3f':
  Fix for "dexopt: No such file or directory" error