Merge "Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d"
am: 4fa1092c54

* commit '4fa1092c5469ad2ea4fbcc7a0aba08a258a62879':
  Track libcore change f121f31fd91c5a557225cd6a97418e716529eb2d