update to merge of xt926 & xt925 into one device dir

Change-Id: Id56c46c878153c91ca1d5ab185d9297bed446f18