unify jf builds

Change-Id: Ic9e289b2dccb2e296290a39785faea59712bcd72