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

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