California governor keeps key higher education pledges but significant aid for non-tuition costs remains