am 5dc0f5db: merge from open-source master

Merge commit '5dc0f5db7152a604377af30f7d2139a84fd7b30c' into kraken

* commit '5dc0f5db7152a604377af30f7d2139a84fd7b30c':
  Use linenoise to add simple editing and history to the Android shell.