Merge changes Iee37bb97,If7c549b8

* changes:
  Adjust IMapperMetadataTypes.h to match gralloc4 encoding
  Add some more tests & tweak spec around SMPTE2094-40