US proposes $336m in civil, mily aid to Pakistan