Revert "jflte: Clean up remaining stuff out of sync with upstream"

This reverts commit 891206643c0e4f80d548cdafbb9252cdf047f9b4.

Change-Id: I85f4bf8123c0329638205e448ef2e3609d40d07f