Merge Upstream changes - adds official AZTEEG X3 and ViKi LCD