Merge "Services: Convert DefaultPreferencesFactory's static to a const now HHVM is...