Remove device/generic/goldfish/Android.mk and move the include to build/make/core/main.mk Bug: 343823190 Test: presubmits Change-Id: Ifb885ceb44365f9f6a8ea339a4b275a76b9bcdae