Merge "Add systemui tests to testdefs."