Fix issue where non-AB-ota devices will cause flashall to fail.
am: d9ff210e63

Change-Id: Ice8f096b5a4aecc015c7001e278984fd6324d47c