Cleanup after QCRIL merge