Update camera patch to patch set 16 (http://review.cyanogenmod.org/#/c/46287/)