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

Change-Id: If3b3d33722c92dc81f37701473273418052347d4