am 586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"
am 586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"

* commit '586b38cc397758848dbfc09351cadd39b89b9e49':
  Calculate max_stashed_blocks correctly for block OTA v3

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build