Merge "Refine (optional) system_server Proguard config"