Merge "Update core/Makefile to add variable PRODUCT_EXTRA_STUB_LIBRARIES." into main