Revert "jflte: Clean up Samsung device inheritance"

This reverts commit 5972194384d749f334bc9a418cf67d365b844a1d.