Clean up after QCRIL merge

Change-Id: Idd42844939644b3f9184b1be59a1a7cf6c28c127