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

This reverts commit e6fa95c4c2a313c7e7155b22a023903d2dd8dbde.

Change-Id: I88ea5e8434336d436a17b3436d6d62153949ec8a