Merge "Swap libcore annotations for framework versions" am: b2a8384164 am: da1171a290
am: f8dcfb2fcd

Change-Id: I293da9d71f79c3592d118b72f3db13661d5e81a5