android: reenable photophase

Change-Id: Ic38096772bc1e07efa13b463a2661e07b77f15c4
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Add CAF RIL variant

Change-Id: I68c620d19ceb8785b894753dc42a7cd7af928097
Merge remote-tracking branch 'cyanogen/cm-12.0' into cm-12.0