Merge \"Revert \"Add Fastboot support for flashing secondary images\"\" into nyc-mr1-dev
am: d28edb60cd  -s ours

Change-Id: I0bd1bce4cdc52ef526e7bf0b9c9e41213a6d9095