Merge "Track libcore change e42e99816ad6c0626564aaabcf636e8febc1edc6"