am d21d1d27: am 00e1f003: Merge "Check partition hash before resorting to block_image_verify"

* commit 'd21d1d273b83e701667beeabe0c76fd6888e15fc':
  Check partition hash before resorting to block_image_verify