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

Change-Id: I61c8f0cc17df1131448196cdf941b95facff5066