Merge "Stop depending on source for libcore UnsupportedAppUsage annotation" am: 685d950f am: 77e9723b am: 1a14e840 Change-Id: I4c578bdabd1380cb897cf757f86b4f0470c8b53f