Merge "arm/dt: 8974: update ion heap sizes and definitions"