Merge "Clean up, de-dup, and speed up ContextImpl getSystemService()"