Merge "Move handheld specific stuff into handheld.mk" into main