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

Change-Id: Ia9cb57d270dfb9ae634fbe72f7b9c8591ade89a3