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

Change-Id: Ia37618f5de09faa89f2ed421eae0760118c1483e