Revert \\"Revert \\"Add Fastboot support for flashing secondary images\\"\\" am: 89eb689d5c  -s ours
am: 14fd059bc4

Change-Id: Ic9359529a207ed0fa9aa1121bbb6948f3104598a