Track RIL_caf and PhotoPhase from CM

Change-Id: I5803ca308511051745008c12d3609b78c57cbb43