Allow shell to start vendor shell am: 00ab5d86be am: 8fe0a12faf
am: bf7d32846f

Change-Id: Ia7d99d5c945309f612a53dbc5bab25be7c5ff772