Merge "Rename the ojluni-annotated-stubs target."