Merge "Fastboot changes to support A/B partitioning" am: f8e70a3a60
am: fb764d9373

* commit 'fb764d93739b8bf41afe3a52cc45ab05f3759286':
  Fastboot changes to support A/B partitioning