am 385f1caf: Merge "Move away from MediaDebug and use ADebug instead"

* commit '385f1cafa6e55d2f4b8846746fe7fe4e8755aedd':
  Move away from MediaDebug and use ADebug instead