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

* commit '0187511e70960618ac5c84f1446ec955ba6c8955':
  Fix for "dexopt: No such file or directory" error