Merge "Revert "Disable Crankshaft in DRT for performance testing.""