unified jflte

Change-Id: I8a0d22ddaf753c3f81f7141e6a5a4e6f974665d0
Unify d2's

Change-Id: Ic760a1900dbc61029d3e9ba8f64cc57a32fe5803

Conflicts:

	default.xml