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

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