Merge "plat: marvell: Update SUBVERSION to match Marvell's forked version" into integration