Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" am: caa816451c am: d771b36951
am: 728ce76156

Change-Id: I8f340a9ff5f98ad028db8ebd7502f6b12d0c464c