Update CM reservoir

this is to address cyankang failures. There was no ROM link, so this patch
is untested. The possibility remains that there will be telephony-common patch
errors as well. But this is pretty close to CM, I hope it will be okay.

closes #189