Merge "libcameraservice: Fix build in ISO C++11 mode"