Merge "HardwareAPI: set enum basetypes for MediaImage2" into nyc-dev