am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master
Elliott Hughes authored
* commit 'e16a21c6':
  Track libcore API change.
dff4ec87