am b54c59e8: Merge "Revert "Fix dexlist build""

* commit 'b54c59e82dc169aaa745c1bb82416cc037d73603':
  Revert "Fix dexlist build"