Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"