Merge "Stop unnecessarily building in android.support.test classes into FrameworkServicesTests."