Merge "change 'xt926' reference to xt925 in vendor mk" db15495