RFR: JDK-8263473: Update annotation terminology (2)

[Jonathan Gibbons]

This work started as a small cleanup in another changes, but the test changes became big enough to warrant a senate changeset.

When the recently changed the terminology from "annotation type" to "annotation interface", we missed a case.  This changes addresses that omission.

I re-flowed the text blocks in the affected tests using our text-block utility.

-------------

Commit messages:
 - reflow text blocks
 - Merge remote-tracking branch 'upstream/master' into anno-intf
 - JDK-8263473: Update annotation terminology (2)

Changes: https://git.openjdk.java.net/jdk/pull/3162/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk&pr=3162&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8263473
  Stats: 492 lines in 11 files changed: 60 ins; 0 del; 432 mod
  Patch: https://git.openjdk.java.net/jdk/pull/3162.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk pull/3162/head:pull/3162

PR: https://git.openjdk.java.net/jdk/pull/3162