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

Change-Id: Ib4c4f2efaa14b165ea74bfc7c1b8d5ce79eb79a2