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

Change-Id: I4385332a08e593b1f291f50ebd0d6cef600535a0