Merge "msm7630_1x: Fix partition table to not overlap system and cache"