Complete de-unification of  jflte

Change-Id: I00ccc3637ef5699050bafc36766f53ccbb2de26f