Revert "Revert "jflte: Clean up Samsung device inheritance""

This reverts commit 28ee8108708bf11e6519fa726411f540c8c2e2f8.