Track CM's frameworks/native again

The issue that we forked this repo for has been fixed upstream.