am 456688bf: merge from open-source master

Merge commit '456688bfb4fa7817031a1d704e8353e1dd5efb3c' into kraken

* commit '456688bfb4fa7817031a1d704e8353e1dd5efb3c':
  adb: remove obsolete shell history support.