Bug 917642 - Use our own copy of rild