Merge "SnapdragonCamera: Change 13MP resolution to 4160x3120"