Merge "Trivial correction of Camera2 API description"