Camera: latest merges

Change-Id: I3af28535108ab24c7a038105c7df15839fb31c9d
Merge "Camera: latest merges" into cm-10.1