Fix font dependencies

Change-Id: Ia80165d3f7d9599f9012bb77af12c90bb1fe7762