Move gpu/msm_adreno220 and video/msm_8x60 back to respective locations