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

Change-Id: I665b1ef11291e189311e665d27b38402ec27a27b