Merge "Remove libportable from core_base.mk."