Merge "Fix google-explicit-constructor warnings in camera."
am: f9ee5183c8

Change-Id: I527e9527c65fbd1a4b9ac8fbf6f60ca60e830d02