am 0be69b52: Merge "dexdump is present even on user builds."

* commit '0be69b5268823139b04411f6a8e15cb58f54ddae':
  dexdump is present even on user builds.