Remove unnecessary variable assignment

This commit fixes an accidental double assignment for the option
list in shell.py.

Change-Id: I0f0b2f57c923667beb1aa7eee5fe4266fcf6d185
Merge "Remove unnecessary variable assignment"