Merge "runtest def for systemui-google"