Merge "Stop depending on source for libcore UnsupportedAppUsage annotation"
am: 685d950fdf

Change-Id: Ia1c4d30520403241b3df38bfa469e64d8397fef3