Merge changes I8fb6b513,I6dd16245,I0c2753e2 am: 8336a96c9c
am: 79915d9ea7

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