Use newer matrix api

Test: make

Change-Id: I46cfce0346342999acb83705dd64870c3c81cc49
1 file changed