jflte: Clean up remaining stuff out of sync with upstream

Change-Id: Ieb0c82048fa1946904a7f0ebd1aab5f7f746a653
Merge "jflte: Clean up remaining stuff out of sync with upstream" into kk4.4