cherry-pick fix_inline_branch

not using google project bash-completion-lib version's of _get_cword

Change-Id: I3625c05972d062316341a5564751aa7dfc7736ff