Merge "Allow update_verifier to access bootctrl_block_device."
am: e8b176ed44

* commit 'e8b176ed44484f680ebb4c3e1474833e7d35ff78':
  Allow update_verifier to access bootctrl_block_device.