I'd love to see Android divested and bought by a non-profit body, but expecting the US to do anything right is several universes too far. America was a mistake...
As much legacy code as has been written in C++, I'd think a total rewrite might be better ironically, in terms of passing on important institutional knowledge, to the extent large-scale production codebases are concerned. Attacking it bit by bit (pun not intended) might even take longer than just ripping things up and starting anew.
So...I'm fucked? Lovely...