Android 7.1.1 Release 22 (NMF26X)
Merge "Bash completion: Fix ls options and also support "shell cat""
am: 9d7a46cfa2

* commit '9d7a46cfa2bdf2cfa681082488b60b35fdc46059':
  Bash completion: Fix ls options and also support "shell cat"