Merge "Stop depending on source for libcore UnsupportedAppUsage annotation" am: 685d950fdf am: 77e9723b71
am: 1a14e840b9

Change-Id: I4c578bdabd1380cb897cf757f86b4f0470c8b53f