Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf am:...
Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf am: 0915192d am: 514464f4 am: cb6e5d6e
am: 37e0a464
Change-Id: I326034b1cfc53a1399a882efe1e2901e2c7876a0