Merge "Add more OWNERS for classes in android.server"