Merge "Allow recycling of Preferences in com.android.* packages" into klp-dev