Merge "Try to reenable some libcore tests with CC."
am: 4015a34900

* commit '4015a3490066c493424ff8c57d6b814cdc49f40c':
  Try to reenable some libcore tests with CC.