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

Change-Id: Idd9e6ee25e60b9882f3992cf1b19f929eca37621