jflte: Fix merge failures

Change-Id: I079e8763da777d94bca4b3d66a5171c943b6c223