Revert "initial convert systemUI GB into JB, part 1"

This reverts commit c9a6840d7452f86a263ce54c1927bdcd5ea810da.