Merge "Migrate annotations of two ojluni classes to Java stubs."