Merge "camera2: Move parameters around to different packages"