Clean up after QCRIL merge

Change-Id: I63068cecf671a50364f95f35e28af88a3c52625e