android: reenable photophase

Change-Id: Ic38096772bc1e07efa13b463a2661e07b77f15c4
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0