Merge "Apply android.jar defaults to system server stub"