Merge "Stop depending on source for libcore UnsupportedAppUsage annotation"