Use newer matrix api

Test: make

Change-Id: I57491a1b352f36b72aba4da2216f7e930b45ed62
5 files changed