Merge "board: 8930: Fix boot failure of 8930 boards" into msm-3.0