resolve merge conflicts of 28ce9cd to lmp-dev

Change-Id: I52e1077e21545b15a9b568a3c048580de99c8080

diff --cc camera/src/camera_metadata.c
index 9bb58cb,e9ad689..0010f31
--- 1/camera/src/camera_metadata.c
--- 2/camera/src/camera_metadata.c
+++ b/camera/src/camera_metadata.c
@@@ -390,8 -381,15 +390,16 @@@ int validate_camera_metadata_structure(
          return ERROR;
      }
  
 -    uptrdiff_t entries_end = metadata->entries_start + metadata->entry_capacity;
+     if (metadata->data_count > metadata->data_capacity) {
+         ALOGE("%s: Data count (%" PRIu32 ") should be <= data capacity "
+               "(%" PRIu32 ")",
+               __FUNCTION__, metadata->data_count, metadata->data_capacity);
+         android_errorWriteLog(SN_EVENT_LOG_ID, "30591838");
+         return ERROR;
+     }
+ 
 +    const metadata_uptrdiff_t entries_end =
 +        metadata->entries_start + metadata->entry_capacity;
      if (entries_end < metadata->entries_start || // overflow check
          entries_end > metadata->data_start) {