Merge "Rename the ojluni-annotated-stubs target."
am: 542d032f03

Change-Id: Ie6c230f36bacaba67a7e1c7952faf029d61d8112