Merge changes I8fb6b513,I6dd16245,I0c2753e2
am: 8336a96c9c

* commit '8336a96c9c4052dbbd7684eaa22b62bf0a4d0732':
  Update fastboot help command with long options
  Changed set_active to be a flag
  Fix fastboot variable name