Merge "SDK targets should inherit from core_64_bit.mk"