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

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