Merge "Fix java 9 failure when building libcore-unsupportedappusage-annotation"