[automerger skipped] Revert "Fix dynamic partition size check for devices with recovery" am: c5aae579 -s ours
am: 579158b4 -s ours
am skip reason: change_id I289faf11a08acbcef36924eb747a15f55124ce79 with SHA1 bd4301e1 is in history
Change-Id: Icd67466b93116b1dd0f07a4c77c379d6471dd4f8