Merge "configs: sm6150: update xml and mk file or SVA3.0"