Merge "media/hardware/HardwareAPI.h: Added metadata struct used by video decoder"