Merge "Move SharedPreferencesImpl out of ContextImpl.java"