Revert "jflte: Clean up Samsung device inheritance"

Temporary

This reverts commit a49e5ad9e7915054a316deab38f6c005a2e9eb99.

Change-Id: I74180b1707540819d1f4fbb2488322d99a496406