Merge "Stop asking for old versions of C++ in system/core." am: e61e2fcf21 am: 0915192d8b am: 514464f4ca am: cb6e5d6ed2
am: 37e0a46463

Change-Id: I326034b1cfc53a1399a882efe1e2901e2c7876a0