CameraNext 2.0.004 & GalleryNext 1.0.5 from CM11s

Change-Id: I25dc191ec9cc9ea28a26770a729be1e6314a29d7