Merge "Track libcore change d7d594236d66c4d595f7622a264fd51." am: 97ebc29e9c
am: b872486722

Change-Id: Ia7111f2be312494fbdb816efae9a7b465ce6b1a4