Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d" am: 4ee94a6a9b
am: 104e268a14

Change-Id: I68a128d0e2efc1e960be2ffd08ac381db0640339