Merge "Track libcore commit a2d9879b" am: 4aa106a790
am: b89ec268ab

Change-Id: I0649915b7efcbfa2c14b68d16c4d0de71656d694