Merge "Revert "target: samarium: Add support for new platform subtype""