jflte: cleanup from rebase

Change-Id: Iad35d6d61bc743c7d67b3b8408b3607957dc5c00