am 88bfdacc: (-s ours) am 74a53f47: Merge "DO NOT MERGE Add libcore test expectations" into jb-dev

* commit '88bfdaccba3141a3b08b5800ca9c458b139dbce0':
  DO NOT MERGE Add libcore test expectations