Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage-aosp-master