Merge "Revert "goldfish: add HardwareDecoder feature""