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

Change-Id: I0df830487bfcf5ac194ecd8047fc7277105d9443

Conflicts:
	arch/arm/configs/vigor_aosp_defconfig