am 3eccdde9: am c7614eb7: Merge "libcameraservice: Fix build in ISO C++11 mode"

* commit '3eccdde99f7063eba4e2788aa7c8c290f7a24120':
  libcameraservice: Fix build in ISO C++11 mode