At some point, to protect users, one of these ROM developers is going to have yo fork away from upstream. Google makes this hard, similar to what they do with chromium, but it will have to be done.