Merge "Further refine system_server Proguard rules"