resolved conflicts for merge of 8b91acde to master

Change-Id: I6a0a02c008bcc38b8ff4b9a251c1e8e7b3d1c102

diff --cc camera/src/camera_metadata.c
index c7a08d2,6b63b82..46ff94f
--- 1/camera/src/camera_metadata.c
--- 2/camera/src/camera_metadata.c
+++ b/camera/src/camera_metadata.c
@@@ -14,8 -14,8 +14,9 @@@
   * limitations under the License.
   */
  #define _GNU_SOURCE // for fdprintf
+ #include <inttypes.h>
  #include <system/camera_metadata.h>
 +#include <camera_metadata_hidden.h>
  
  #define LOG_TAG "camera_metadata"
  #include <cutils/log.h>