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

Change-Id: Id7cbfd270890da3a29b10393f10bd128d219f9e5