Merge "Track libcore change e42e99816ad6c0626564aaabcf636e8febc1edc6"
am: ffa1c08440

* commit 'ffa1c08440c5404d722e69ea59e21103f76323a8':
  Track libcore change e42e99816ad6c0626564aaabcf636e8febc1edc6