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

Change-Id: I4e41e4f243d68f73b67dc066d5b780ef5926b749