Merge "msm8953: Add non-hlos file contexts for A/B"