Merge "hikey960: Update manifest to soundtrigger 2.3"