Merge "HardwareAPI: add MediaImage2 and DescribeColorFormat2Params"