am 0bfe5322: Merge "Fix dexlist build"

* commit '0bfe5322bdb29a3d4bb520073893dffa16dd17b3':
  Fix dexlist build