Merge "Track libcore change 4e73fd2bc22e704fe71465782b83be0471ac5e82" into stage-aosp-master