Merge "Delete old and unused graphics test from contrib" am: 3a7a0b6339

Change-Id: I7a8b354dea94274b9f84610e51b52ac8ddcead6e