Merge "app: aboot: Fix splash partition corruption"