Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev