PSOL API change and unit tests for matches_device_type
Remove unit tests; They are now in system_test.sh
Merge remote-tracking branch 'origin/trunk-tracking' into cheesy-device-matching
Merge pull request #811 from pagespeed/cheesy-device-matching

Support minor PSOL API change for matches_device_type