Moving the corresponding core_64_bit_only make file after removing the entry from the common64.mk file. This is to enable the GSI components for 64 bit option available. Change-Id: Idefd924e096371ae53fd76781257667b4f5a2fb7