Merge "Adding frameworks-services tests to the runtest collection."