Merge "Swap libcore annotations for framework versions"