Restore test deps for matplotlib tests

These are needed for the tests, fix compilation errors seen on the
default OpenGL dashboards.

Change-Id: Ic8b761cb8ad553f96a32cf29673ce4d9a0757d0f
Merge topic 'fix-matplotlib' into master

3ae161f7 Restore test deps for matplotlib tests