Merge "Stop asking for old versions of C++ in system/core."