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

Change-Id: I2c512a54b8bb3a0824ea1c279ca67e52a23f4a18