Merge \"Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a\"
am: 18941cb53f

Change-Id: I40ce35ca5e8901f3e8b1e06258c7a5649084d51e