Allow shell to start vendor shell
am: 00ab5d86be

Change-Id: Ia2db656580086c542a2dd96cbd725686063bcb26