Merge "Track libcore commit a2d9879b"