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

Change-Id: Ifb30d784944408e88e8ba5018022fe2c28ed2303