jflte: fix mismerge after cleanup

Change-Id: Id2b6717354e2971f2cd1c7bf87634eeb3957aa9d