Add X fonts path switch

Change-Id: I97f9ab46c3fe4afcd25f253dfd18e02a79136119