Merge "Camera: Add more htc parameters" into cm-10.1