Merge "Retire kernel-tests from goldfish"